Don't crash if search_window is NULL. (#304914, Victor Osadci, testcase by

2005-06-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
	Don't crash if search_window is NULL.  (#304914, Victor Osadci,
	testcase by Olaf Vitters)

diff --git a/ChangeLog b/ChangeLog
index ca185c873a78cf15556733d0ed9dd08c0763ee3d..8b3d0f2ef7828c218aa2235ad3051e48f79f70a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-06-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): 
+       Don't crash if search_window is NULL.  (#304914, Victor Osadci,
+       testcase by Olaf Vitters)
+
        * gtk/gtkimage.c: Make the file property readable.  
        (#170674, Lorenzo Gil Sanchez)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ca185c873a78cf15556733d0ed9dd08c0763ee3d..8b3d0f2ef7828c218aa2235ad3051e48f79f70a4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-06-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): 
+       Don't crash if search_window is NULL.  (#304914, Victor Osadci,
+       testcase by Olaf Vitters)
+
        * gtk/gtkimage.c: Make the file property readable.  
        (#170674, Lorenzo Gil Sanchez)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ca185c873a78cf15556733d0ed9dd08c0763ee3d..8b3d0f2ef7828c218aa2235ad3051e48f79f70a4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2005-06-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): 
+       Don't crash if search_window is NULL.  (#304914, Victor Osadci,
+       testcase by Olaf Vitters)
+
        * gtk/gtkimage.c: Make the file property readable.  
        (#170674, Lorenzo Gil Sanchez)
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 1cc8df2cef06d3e9daef667f8202465a8ab00f8f..196cf895debf3f4e3ca5b88773017c05bab138c1 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -9011,7 +9011,8 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view,
   if (!tree_view->priv->enable_search && !keybinding)
     return FALSE;
 
-  if (GTK_WIDGET_VISIBLE (tree_view->priv->search_window))
+  if (tree_view->priv->search_window != NULL &&
+      GTK_WIDGET_VISIBLE (tree_view->priv->search_window))
     return TRUE;
 
   for (list = tree_view->priv->columns; list; list = list->next)